Auto merge of #4202 - dethoter:issue-4199, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 21 Jun 2017 17:49:38 +0000 (17:49 +0000)
committerbors <bors@rust-lang.org>
Wed, 21 Jun 2017 17:49:38 +0000 (17:49 +0000)
Fix an incorrect merge of credentials. Add a new test for that.

Fix for #4199.


Trivial merge